Merge tag 'upstream/2.2.0'
authorGraham Inggs <ginggs@debian.org>
Fri, 27 Jul 2018 08:24:59 +0000 (10:24 +0200)
committerGraham Inggs <ginggs@debian.org>
Fri, 27 Jul 2018 08:24:59 +0000 (10:24 +0200)
Upstream version 2.2.0


Trivial merge